gsk: Don't use wildcards
authorBenjamin Otte <otte@redhat.com>
Thu, 5 Jan 2017 12:37:58 +0000 (13:37 +0100)
committerBenjamin Otte <otte@redhat.com>
Fri, 6 Jan 2017 15:31:53 +0000 (16:31 +0100)
Explicitly list all the shaders, so new ones get picked up properly and
cause the resource file to be regenerated (due to Makefile.am changing).

gsk/Makefile.am

index 21058c098cb95e03c7310c642f7c14e62a49bd6d..2a309ef575b8bf7ea1a3b355c0903f5a351a43df 100644 (file)
@@ -56,7 +56,30 @@ gsk_private_vulkan_source_c = \
        gskvulkanrenderpass.c \
        gskvulkanshader.c
 gsk_private_vulkan_shaders = \
-       resources/vulkan/*.glsl
+       resources/vulkan/blend-clip.frag.glsl \
+       resources/vulkan/blend-clip-rounded.frag.glsl \
+       resources/vulkan/blend-clip-rounded.vert.glsl \
+       resources/vulkan/blend-clip.vert.glsl \
+       resources/vulkan/blend.frag.glsl \
+       resources/vulkan/blend.vert.glsl \
+       resources/vulkan/color-clip.frag.glsl \
+       resources/vulkan/color-clip-rounded.frag.glsl \
+       resources/vulkan/color-clip-rounded.vert.glsl \
+       resources/vulkan/color-clip.vert.glsl \
+       resources/vulkan/color.frag.glsl \
+       resources/vulkan/color.vert.glsl \
+       resources/vulkan/color-matrix-clip.frag.glsl \
+       resources/vulkan/color-matrix-clip-rounded.frag.glsl \
+       resources/vulkan/color-matrix-clip-rounded.vert.glsl \
+       resources/vulkan/color-matrix-clip.vert.glsl \
+       resources/vulkan/color-matrix.frag.glsl \
+       resources/vulkan/color-matrix.vert.glsl \
+       resources/vulkan/linear-clip.frag.glsl \
+       resources/vulkan/linear-clip-rounded.frag.glsl \
+       resources/vulkan/linear-clip-rounded.vert.glsl \
+       resources/vulkan/linear-clip.vert.glsl \
+       resources/vulkan/linear.frag.glsl \
+       resources/vulkan/linear.vert.glsl
 gsk_private_vulkan_compiled_shaders = \
        $(gsk_private_vulkan_shaders:.glsl=.spv)
 endif
@@ -84,7 +107,16 @@ gsk_private_source_h = \
        gskshaderbuilderprivate.h \
        gsktextureprivate.h
 gsk_private_source_shaders = \
-       resources/glsl/*.glsl
+       resources/glsl/blend.fs.glsl \
+       resources/glsl/blend.vs.glsl \
+       resources/glsl/blit.fs.glsl \
+       resources/glsl/blit.vs.glsl \
+       resources/glsl/es2_common.fs.glsl \
+       resources/glsl/es2_common.vs.glsl \
+       resources/glsl/gl3_common.fs.glsl \
+       resources/glsl/gl3_common.vs.glsl \
+       resources/glsl/gl_common.fs.glsl \
+       resources/glsl/gl_common.vs.glsl
 gsk_public_source_c = \
        gskrenderer.c \
        gskrendernode.c \